Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Organization Users page needs responsiveness #10413

Merged
merged 28 commits into from
Feb 20, 2025

Conversation

Tanuj1718
Copy link
Contributor

@Tanuj1718 Tanuj1718 commented Feb 5, 2025

Proposed Changes

Before Update:
Screenshot 2025-02-05 at 12 42 02 PM

After Update:
Screenshot 2025-02-05 at 1 37 22 PM

EDIT 1: Color of Link User button changed. Now it is same as earlier.
EDIT 2: Fixes #10429

@ohcnetwork/care-fe-code-reviewers

Merge Checklist

  • Add specs that demonstrate bug / test a new feature.
  • Update product documentation.
  • Ensure that UI text is kept in I18n files.
  • Prep screenshot or demo video for changelog entry, and attach it to issue.
  • Request for Peer Reviews
  • Completion of QA

Summary by CodeRabbit

  • Style
    • Updated layouts and component spacing for improved responsiveness, including flex and grid adjustments.
    • Refreshed button appearances and enhanced text truncation to better handle variable content.
  • Refactor
    • Reorganized the arrangement of user information for a more fluid and consistent display.

These visual enhancements provide a cleaner, more adaptive experience without altering any underlying functionality.

@Tanuj1718 Tanuj1718 requested a review from a team as a code owner February 5, 2025 11:19
Copy link
Contributor

coderabbitai bot commented Feb 5, 2025

Walkthrough

This pull request introduces several layout and styling modifications across multiple UI components. The changes enhance how user information is displayed by adjusting flex and grid layouts, adding wrapping capabilities, and applying text truncation styles. These updates affect pages in the Organization and Facility settings as well as common components for user display, without altering any functional logic or public APIs.

Changes

File(s) Change Summary
src/pages/Organization/OrganizationUsers.tsx Modified div classes to add flex-wrap to the layout, ensuring child elements wrap as needed.
src/pages/Organization/components/LinkUserSheet.tsx, src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx, src/pages/Facility/settings/organizations/components/LinkFacilityUserSheet.tsx Updated UI layouts: switched between flex and grid layouts, changed button variant to primary_gradient, introduced truncation classes, and adjusted margins.
src/components/Users/UserListAndCard.tsx, src/components/Common/UserSelector.tsx Adjusted CSS class names to improve text wrapping and width constraints, including updating badge styling and max-width properties.

Possibly related PRs

  • Add phone number search for organization users #10598: The changes in the main PR focus on modifying the layout of UI components in OrganizationUsers.tsx, while the retrieved PR introduces new search functionality in the same file, indicating a direct relationship in terms of code modifications.
  • Improves responsiveness of Encounter Medicines tab #10511: The changes in the main PR and the retrieved PR both involve modifications to layout properties, specifically the addition of the flex-wrap class to enhance responsiveness, indicating a related focus on UI layout adjustments.

Suggested reviewers

  • Jacobjeevan
  • rithviknishad

Poem

I'm a little rabbit, coding with delight,
Flex and grid now twirl so light,
Buttons gleam in gradients bright,
Text wraps neatly, keeping things just right,
Hopping through code from day to night!


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 6a34c98 and 3bfbc87.

📒 Files selected for processing (1)
  • src/pages/Organization/OrganizationUsers.tsx (2 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • src/pages/Organization/OrganizationUsers.tsx
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: cypress-run (1)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

netlify bot commented Feb 5, 2025

Deploy Preview for care-ohc ready!

Name Link
🔨 Latest commit 3bfbc87
🔍 Latest deploy log https://app.netlify.com/sites/care-ohc/deploys/67b78c6108dc4800088144f2
😎 Deploy Preview https://deploy-preview-10413.preview.ohc.network
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (4)
src/pages/Facility/settings/locations/LocationView.tsx (4)

98-98: Remove unnecessary flex-wrap property.

The flex-wrap property has no effect on a flex-col container since columns don't wrap. Consider simplifying to:

-      <div className="my-4 flex flex-col flex-wrap">
+      <div className="my-4 flex flex-col">

99-101: Simplify nested flex containers.

While the flex-wrap properties improve responsiveness, the nested structure with multiple flex containers is redundant. Consider simplifying:

-        <div className="py-2 flex flex-wrap justify-between">
-          <div className="flex flex-col flex-wrap justify-between items-start gap-4">
-            <div className="flex flex-wrap items-center gap-4 py-2">
+        <div className="py-2 flex flex-wrap items-start justify-between gap-4">
+          <div className="flex flex-wrap items-center gap-4">

120-120: Remove unnecessary flex properties from search input.

The flex-wrap properties on both the container and input element don't contribute to the layout:

-            <div className="flex flex-wrap w-72">
+            <div className="w-72">
               <Input
                 placeholder={t("search_by_name")}
                 value={searchQuery}
                 onChange={(e) => {
                   setSearchQuery(e.target.value);
                   setPage(1);
                 }}
-                className="w-full flex flex-wrap"
+                className="w-full"
               />

Also applies to: 128-128


139-139: Remove trailing space in className.

The button styling is good for touch targets, but there's an unnecessary trailing space in the className:

-                <Button variant="outline" className="py-2 my-2 ">
+                <Button variant="outline" className="py-2 my-2">
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 5d9273d and ea48433.

📒 Files selected for processing (3)
  • src/pages/Facility/settings/locations/LocationView.tsx (3 hunks)
  • src/pages/Organization/OrganizationUsers.tsx (2 hunks)
  • src/pages/Organization/components/AddUserSheet.tsx (1 hunks)
✅ Files skipped from review due to trivial changes (2)
  • src/pages/Organization/components/AddUserSheet.tsx
  • src/pages/Organization/OrganizationUsers.tsx
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: cypress-run (1)
🔇 Additional comments (1)
src/pages/Facility/settings/locations/LocationView.tsx (1)

98-151: LGTM! The responsive layout improvements are well implemented.

The changes successfully improve the mobile responsiveness of the location view. While there are some opportunities to optimize the flex properties as noted above, the overall direction is good.

@Jacobjeevan
Copy link
Contributor

Include #10429 as well 👍

@Tanuj1718 Tanuj1718 mentioned this pull request Feb 6, 2025
6 tasks
@Jacobjeevan
Copy link
Contributor

Include #10429 as well 👍

Add this issue number in the description as well.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
src/pages/Facility/settings/organizations/components/LinkFacilityUserSheet.tsx (1)

146-152: Consider improving text truncation for user details.

While the container has the truncate class, the name and email might still overflow. Consider adding individual truncation.

 <div className="flex flex-col truncate">
-  <span className="font-medium text-lg">
+  <span className="font-medium text-lg truncate">
     {selectedUser.first_name} {selectedUser.last_name}
   </span>
-  <span className="text-sm text-gray-500">
+  <span className="text-sm text-gray-500 truncate">
     {selectedUser.email}
   </span>
 </div>
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 2b7ad7d and 837a6c9.

📒 Files selected for processing (4)
  • src/components/Common/UserSelector.tsx (1 hunks)
  • src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx (1 hunks)
  • src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx (1 hunks)
  • src/pages/Facility/settings/organizations/components/LinkFacilityUserSheet.tsx (2 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: cypress-run (1)
🔇 Additional comments (3)
src/components/Common/UserSelector.tsx (1)

66-66: LGTM! Good improvement for handling long usernames.

The addition of the truncate class helps prevent text overflow and improves the responsive design by properly handling long usernames.

src/pages/Facility/settings/organizations/FacilityOrganizationUsers.tsx (1)

69-69: LGTM! Good responsive design improvement.

The addition of flex-wrap ensures proper layout on smaller screens by allowing the title and action buttons to wrap when needed, preventing horizontal overflow.

src/pages/Facility/settings/organizations/components/LinkFacilityUserSheet.tsx (1)

139-139: LGTM! Good responsive design improvements.

The changes improve the handling of long text content and ensure proper wrapping on smaller screens:

  • Added flex-wrap for better layout flexibility
  • Added truncate classes to prevent text overflow

Also applies to: 145-145, 156-156

Copy link
Contributor

@Jacobjeevan Jacobjeevan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In OrganizationUsers:

image

Adjust for iPad; make sure to check other devices as well, for any changes you make.

Ensure more details button remains at the bottom

image

Seems to be fine for FacilityOrganizationUsers, so check against that.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
src/components/Users/UserListAndCard.tsx (1)

67-70: Good improvement to badge responsiveness!

The addition of text-wrap improves the badge's responsive behavior. However, consider using break-words instead of text-wrap for better word breaking control, especially for long translations of "never_logged_in".

-          className="bg-gray-100 whitespace-nowrap text-wrap"
+          className="bg-gray-100 whitespace-nowrap break-words max-w-[200px]"
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 837a6c9 and 3a20f25.

📒 Files selected for processing (3)
  • src/components/Users/UserListAndCard.tsx (1 hunks)
  • src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx (1 hunks)
  • src/pages/Organization/components/LinkUserSheet.tsx (5 hunks)
🚧 Files skipped from review as they are similar to previous changes (2)
  • src/pages/Organization/components/LinkUserSheet.tsx
  • src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: cypress-run (1)

Copy link
Contributor

@Jacobjeevan Jacobjeevan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make changes, self-review and test before requesting review again.

@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Feb 17, 2025
Copy link

Conflicts have been detected against the base branch. Please merge the base branch into your branch.
cc: @Tanuj1718

See: https://docs.ohc.network/docs/contributing#how-to-resolve-merge-conflicts

@github-actions github-actions bot removed the merge conflict pull requests with merge conflict label Feb 18, 2025
@nihal467
Copy link
Member

@Tanuj1718 what is the status of the PR

@Tanuj1718
Copy link
Contributor Author

Tanuj1718 commented Feb 18, 2025

@Tanuj1718 what is the status of the PR

@nihal467 It is ready for review

@nihal467
Copy link
Member

LGTM

@Jacobjeevan Jacobjeevan merged commit e250548 into ohcnetwork:develop Feb 20, 2025
15 checks passed
Copy link

@Tanuj1718 Your efforts have helped advance digital healthcare and TeleICU systems. 🚀 Thank you for taking the time out to make CARE better. We hope you continue to innovate and contribute; your impact is immense! 🙌

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
3 participants